Skip to content

Comments

[8.x](backport #41128) [Heartbeat] Fix linting issues introduced by auto-merge #41077#41134

Merged
emilioalvap merged 4 commits into8.xfrom
mergify/bp/8.x/pr-41128
Oct 16, 2024
Merged

[8.x](backport #41128) [Heartbeat] Fix linting issues introduced by auto-merge #41077#41134
emilioalvap merged 4 commits into8.xfrom
mergify/bp/8.x/pr-41128

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 4, 2024 •
edited by zube bot
Loading

Proposed commit message

Fix linting issues introduced by auto-merge of #41077.

Checklist

  • [x ] My code follows the style guidelines of this project
  • [ ] I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • [ ] I have added tests that prove my fix is effective or that my feature works
  • [ ] I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.
This is an automatic backport of pull request #41128 done by [Mergify](https://mergify.com).

@emilioalvap @mergify
[Heartbeat] Fix linting issues introduced by auto-merge #41077 (#41128)
fc799b1 
(cherry picked from commit efb563c)

# Conflicts:
#	heartbeat/monitors/monitor.go
#	heartbeat/monitors/monitor_test.go
@mergify mergify bot requested a review from a team as a code owner October 4, 2024 19:10
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 4, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Oct 4, 2024

Cherry-pick of efb563c has failed:

On branch mergify/bp/8.x/pr-41128
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit efb563c890.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   heartbeat/monitors/monitor.go
	both modified:   heartbeat/monitors/monitor_test.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 4, 2024
@emilioalvap emilioalvap added Team:obs-ds-hosted-services Label for the Observability Hosted Services team and removed needs_team Indicates that the issue/PR needs a Team:* label conflicts There is a conflict in the backported pull request labels Oct 4, 2024
@elasticmachine
Copy link
Contributor

elasticmachine commented Oct 4, 2024

Pinging @elastic/obs-ds-hosted-services (Team:obs-ds-hosted-services)

@mergify
Copy link
Contributor Author

mergify bot commented Oct 7, 2024

This pull request has not been merged yet. Could you please review and merge it @emilioalvap? 🙏

vigneshshanmugam
vigneshshanmugam reviewed Oct 7, 2024
View reviewed changes
Copy link
Member

@vigneshshanmugam vigneshshanmugam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ques: Do we want a 8.x backport? Isn't just 8.15 enough?

@emilioalvap
Copy link
Contributor

emilioalvap commented Oct 10, 2024

@vigneshshanmugam afaik, 8.x backports still apply, happy to sync on it

@mergify
Copy link
Contributor Author

mergify bot commented Oct 14, 2024

This pull request has not been merged yet. Could you please review and merge it @emilioalvap? 🙏

@emilioalvap emilioalvap merged commit d50bd34 into 8.x Oct 16, 2024
@emilioalvap emilioalvap deleted the mergify/bp/8.x/pr-41128 branch October 16, 2024 14:38
@khushijain21 khushijain21 mentioned this pull request Jun 23, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vigneshshanmugam vigneshshanmugam vigneshshanmugam approved these changes

Assignees

@emilioalvap emilioalvap

Labels

backport Team:obs-ds-hosted-services Label for the Observability Hosted Services team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @emilioalvap @vigneshshanmugam